Revert change to make preference nncp on worker nodes thatn master nodes #3367
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
evallesp
force-pushed
the
fix-nncp-uni02beta-uni04delta-ipv6
branch
from
afa0f89 to
46add10
Compare
danpawlik
reviewed
Oct 6, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-nodeset-values/values.yaml.j2
Show resolved
Hide resolved
danpawlik
reviewed
Oct 6, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-nodeset-values/values.yaml.j2
Show resolved
Hide resolved
danpawlik
reviewed
Oct 6, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-nodeset-values/values.yaml.j2
Show resolved
Hide resolved
danpawlik
reviewed
Oct 6, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-values/values.yaml.j2
Show resolved
Hide resolved
danpawlik
reviewed
Oct 6, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-values/values.yaml.j2
Show resolved
Hide resolved
It seems these scenarios has master nodes and a single worker node which is tainted. This worker node is used for running tempest but nothing related with OCP. Problematic scenarios are those which has a worker node tainted for tempest, but the workload is set in master nodes. There's no reason to configure NNCP in master nodes when we have regular worker nodes, so we were assuming that in case of there's a worker node, then all NNCP goes to worker node, which is problematic when single worker node is tainted. So we need to enhance the templates to: * Check if there's a worker node, if so, check if those are tainted. * If not tainted, worker takes preference. * If tainted, master takes preference. * If there's no worker node, then we go with master nodes. * Same for SNO CRC scenarios. Adding also uni02beta that takes the template from common
evallesp
force-pushed
the
fix-nncp-uni02beta-uni04delta-ipv6
branch
from
46add10 to
e990cff
Compare
sdatko
reviewed
Oct 8, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-nodeset-values/values.yaml.j2
Show resolved
Hide resolved
sdatko
approved these changes
Oct 8, 2025
roles/ci_gen_kustomize_values/templates/uni02beta/edpm-nodeset-values/values.yaml.j2
Show resolved
Hide resolved
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: arxcruz, sdatko The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It seems these scenarios has master nodes and a single worker node which is tainted. This worker node is used for running tempest but nothing related with OCP.
Problematic scenarios are those which has a worker node tainted for tempest, but the workload is set in master nodes.
There's no reason to configure NNCP in master nodes when we have regular worker nodes, so we were assuming that in case of there's a worker node, then all NNCP goes to worker node, which is problematic when single worker node is tainted.
So we need to enhance the templates to: